Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

simplify merging logic #16525

Merged
merged 4 commits into from
Aug 5, 2024
Merged

simplify merging logic #16525

merged 4 commits into from
Aug 5, 2024

Conversation

systay
Copy link
Collaborator

@systay systay commented Aug 1, 2024

Description

This PR introduces a refined solution to the issue where vtgate stopped accepting cross-keyspace queries. In the original fix, we incorrectly rejected subqueries that weren't merged and failed to properly handle non-correlated subqueries from different keyspaces. This updated approach corrects the handling of these subqueries by planning them differently, ensuring that cross-keyspace functionality is restored in a more accurate and efficient manner.

Related Issues

This PR supersedes the previous fix and addresses the same underlying problem introduced in #12197 and initially addressed in #16515.

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added or is not required

@systay
simplify merging logic
3dce816 
Signed-off-by: Andres Taylor <[email protected]>
@vitess-bot vitess-bot
Copy link
Contributor

vitess-bot bot commented Aug 1, 2024

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Aug 1, 2024
@systay systay added Type: Internal Cleanup Component: Query Serving and removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels Aug 1, 2024
@github-actions github-actions bot added this to the v21.0.0 milestone Aug 1, 2024
@systay systay added Backport to: release-18.0 Backport to: release-19.0 Needs to be back ported to release-19.0 Backport to: release-20.0 Needs to be backport to release-20.0 labels Aug 1, 2024
@codecov Codecov
Copy link

codecov bot commented Aug 1, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.75%. Comparing base (eb29999) to head (c045042).
Report is 69 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main   #16525      +/-   ##
==========================================
+ Coverage   68.69%   68.75%   +0.05%     
==========================================
  Files        1547     1556       +9     
  Lines      198297   199705    +1408     
==========================================
+ Hits       136228   137312    +1084     
- Misses      62069    62393     +324

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

harshit-gangal
harshit-gangal approved these changes Aug 5, 2024
View reviewed changes
Copy link
Member

@harshit-gangal harshit-gangal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, one e2e or planning test for the fix would work.

@systay
add end2end test
f04d740 
Signed-off-by: Andres Taylor <[email protected]>
@systay systay merged commit 4a89749 into vitessio:main Aug 5, 2024
129 checks passed
@systay systay deleted the cross-keyspace2 branch August 5, 2024 06:34
@vitess-bot vitess-bot bot mentioned this pull request Aug 5, 2024
Merged
vitess-bot pushed a commit that referenced this pull request Aug 5, 2024
@vitess-bot
simplify merging logic (#16525)
02de5aa 
Signed-off-by: Andres Taylor <[email protected]>
@vitess-bot vitess-bot bot mentioned this pull request Aug 5, 2024
Merged
vitess-bot pushed a commit that referenced this pull request Aug 5, 2024
@vitess-bot
simplify merging logic (#16525)
f111075 
Signed-off-by: Andres Taylor <[email protected]>
@vitess-bot vitess-bot bot mentioned this pull request Aug 5, 2024
Merged
systay pushed a commit that referenced this pull request Aug 6, 2024
@vitess-bot
[release-20.0] simplify merging logic (#16525) (#16533)
4c8bff1 
Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
systay pushed a commit that referenced this pull request Aug 6, 2024
@vitess-bot
[release-19.0] simplify merging logic (#16525) (#16532)
7f85729 
Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
systay added a commit that referenced this pull request Aug 6, 2024
@systay
simplify merging logic (#16525)
ad9290c 
Signed-off-by: Andres Taylor <[email protected]>
systay added a commit that referenced this pull request Aug 23, 2024
@vitess-bot @systay
[release-18.0] simplify merging logic (#16525) (#16531)
cb39bd9 
Signed-off-by: Andres Taylor <[email protected]>
Co-authored-by: Andrés Taylor <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuptaManan100 GuptaManan100 GuptaManan100 approved these changes

@harshit-gangal harshit-gangal harshit-gangal approved these changes

@frouioui frouioui Awaiting requested review from frouioui frouioui is a code owner

@arthurschreiber arthurschreiber Awaiting requested review from arthurschreiber arthurschreiber is a code owner

@rohit-nayak-ps rohit-nayak-ps Awaiting requested review from rohit-nayak-ps rohit-nayak-ps is a code owner

@deepthi deepthi Awaiting requested review from deepthi deepthi is a code owner

@mattlord mattlord Awaiting requested review from mattlord mattlord is a code owner

Assignees
No one assigned
Labels
Backport to: release-19.0 Needs to be back ported to release-19.0 Backport to: release-20.0 Needs to be backport to release-20.0 Component: Query Serving Type: Bug
Projects
None yet
Milestone
v21.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@systay @harshit-gangal @GuptaManan100